Propagate find_vec const-ness upstream.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index c6c75d7220f4e19ac5e26b7b675f7918a2612300..aa547669a7205d57ad44f71284579b9868a26847 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -923,7 +923,7 @@ void is_fatal(const int condition, const char*, ...) PRINTFLIKE(2, 3);
 void warning(const char*, ...) PRINTFLIKE(1, 2);
 void debug_print(int level, const char* fmt, ...) PRINTFLIKE(2,3);
 
-ff_vecs_t* find_vec(const char *, char**);
+ff_vecs_t* find_vec(const char *, const char**);
 void assign_option(const char* vecname, arglist_t* ap, const char* val);
 void disp_vec_options(const char* vecname, arglist_t* ap);
 void disp_vecs(void);

diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index 6b5a4f5dc0af306c34b56f2778c1edffa7b9cb96..1f0d2243cf7abaad9ec0de5dbabeefad563015d4 100644 (file)
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -301,7 +301,7 @@ static void
 rd_init(const char* fname)
 {
   if (setjmp(gdx_jmp_buf)) {
-    char* vec_opts = NULL;
+    const char* vec_opts = NULL;
     const gdx_info* gi = gdx_get_info();
     gpx_vec = find_vec("gpx", &vec_opts);
     gpx_vec->rd_init(gi->from_device.canon);
@@ -445,7 +445,7 @@ track_read(void)
   route_head* trk_head = NULL;
   int trk_num = 0;
   int i;
-  char* trk_name = "";
+  const char* trk_name = "";
   GPS_PLap* laps = NULL;
   int nlaps = 0;
   int next_is_new_trkseg = 0;

diff --git a/gpsbabel/magproto.cc b/gpsbabel/magproto.cc
index 6be7a1edd5555c38f98e6332436e5fb3ce438489..d34fabbcef0497adf49fa1e346aed53f5c09dcf1 100644 (file)
--- a/gpsbabel/magproto.cc
+++ b/gpsbabel/magproto.cc
@@ -777,7 +777,7 @@ mag_rd_init_common(const char* portname)
     const char** dlist = os_get_magellan_mountpoints();
     explorist_info = explorist_ini_get(dlist);
     if (explorist_info) {
-      char* vec_opts = NULL;
+      const char* vec_opts = NULL;
       gpx_vec = find_vec("gpx", &vec_opts);
     }
     return;

diff --git a/gpsbabel/main.cc b/gpsbabel/main.cc
index ce0199ed6d81b4d57ae5a01e606a09a9d8fd36af..eccf192594d5e92f2d92f20f463522cedb88986c 100644 (file)
--- a/gpsbabel/main.cc
+++ b/gpsbabel/main.cc
@@ -234,8 +234,8 @@ main(int argc, char* argv[])
   filter_vecs_t* fvecs = NULL;
   char* fname = NULL;
   char* ofname = NULL;
-  char* ivec_opts = NULL;
-  char* ovec_opts = NULL;
+  const char* ivec_opts = NULL;
+  const char* ovec_opts = NULL;
   char* fvec_opts = NULL;
   int opt_version = 0;
   int did_something = 0;